0.11.5+ compatibility