Fixed PR comments - return now actually works