weird bug fixed