v1.3.0.529 - revert #523 - I don't care anymore - this HAS to fix it, otherwise I give up on development :P