Hmm for some reason after I did some more testing, and it seems to work now as expected
Thanks for the help.