Okay Maik I think I have it fixed but want to do some more testing before I update the code here.

Will let you know after I've done some more testing.