Fixed #2037