Fixed backwards compatiblity