changes for tishadow >= 2.4.x