Fixed backwards compatibility even more.