Tackled problem 1625