Working on strict and non-strict mode issues