optimization stub building
#COP-144 fixed