possibly fixed the bug