maybe fixed bugs