Fix the embarassing problem