bug fixed remove return