Yes I think that would be a better way to go ... I just fixed it, without getting to deep in to the logic under it as I needed fast fix.