REVERTING Previos quick fix doesn't pass all tests.
BUG Test added