Yes.  That way is much better.  Will fix.