Fix for strict-mode