#485 - fixing some hosted return method calls