Task#5090 - optimization