OP-1351 fixed issue with buttons initial enabled state
OP-1351 fixed compilation error caused by duplicate method