maybe fixed the bug