*(non-blocker)* seems an unnecessary test