forgot to check this in yesterday
return_type issue