fix for return statements