Fix for #152