Tried to fix earlier issue, do not have time to test more but seems to bug a bit...