Bugfix & strict mode