Make it works with 0.9.3