This fixes one of the sprint milestone issues

can i get some :eyes: on this @tlberglund and @githubstudent