Fixed backwards compatibility