Fixed 0.9.0 compatability