Fix for "strict-mode"