Fixed backwards-compatibility