Bug fixed in sprint #7