Changed to conform to c99