removed 1.6.1 compatibility