Fixed buggs with solution