Fix: better performance
Fix: strict mode