optimization #1560