Works with 0.6.5