resolving strict mode issues from december
resolving strict mode issues