Fixed backwards compatability.