Fixed bug that came when allowing arbitrary return values