Workaround issue 481 with NB API