finally fix that bug