Added backward compatibility with Maverick