fixed mo's bug