Fix for #157