fixed very important bug