possibly fixed issue with crashing