#51 #50 Fix.