Fix for return;