removed hack for return statement