Temp fix to fix crashes