Hot fix for return value