Proper fix based on the feedback from NSB team