-Another fix for #53