User stories fix