rejig for 1.8