[fix] Started doing horrible hacks to detect the root cause..