Fixed system to pay attention to ret-value