added return type handling for #489