fixed embarassing last moment change