Fixed story 8 bug