Bug fix day 9