maybe fixed fatal bug