fixing exercise solutions