Story 47500509: fixing changes from rejected story