fixed very bad bug