Week 5 fix

Test are successfully completed.