this should fix the crashy issues