Due to Eclipse/personal fuckup, the fixes from Erwin worked. Uncommented part which crashed otherwise