First upper helper fix