Quick fix for #57