Fix for #37