Bug fix for #57