Fix for #184