ticket:6 Solution (test passed)