Fixed crash hopefully