conforming to 0.4.11 changes