Fixed #1433 #1434 slightly different (creating one object less per call)