Fixing some issues with prior merge
small change