Improve engine
Fix critical error