Works better with 0.7.0