Still trying to bugfix..

No luck.