Fixed an important issue