Again a version neutral fix would be good here.