Homework 12.11.2013 fix