Changed for API compatibility 1.4