Fix for #57