Fix for strict-mode compliance