2.5 compatibility