Fix for numeric return type