Temp fix to crashing issue