Corrected for compilation OK