Fix for #151