Fixed backwards-compatability