Fixes SMACK-749. Thanks to Grigory Fedorov for reporting this and to Kim Alvefur for helping to diagnose the issue.
Related to SMACK-398.