fixing STORE-331.