Fixed the failures of patch #50