fixed VB-3154 and VB-3248