fixed userstory 6