0.11.9+ compatibility