Fix return statement problem on compile