Fix for #53