This fix works on my project so I consider it solved ;)