#31 (Made return statements position aware)