I've figured out a workaround and since nobody knows the real fix, this will be working on 6.1+ releases as it should.