works with 0.6.4.1