Fix for #50