Last commit has not completely fixed the bug.