FIx for #57