Fix for failing test on 0.11.x