Hotfix fixes #150, #152.