reinstated 1.6.3 compatibility