0.9.5 support