Brought back 1.9 compatibility