possibly fixed bugs