[BUG] Temp workaround for bug 65