fixed the most important issue