maybe fixed a bug