NODE-187 fixed