Fixed some epic bug