Fix for return_label