Seem to have fixed the bug. Still making it appear again with multiple tests. Further commits will confirm it.