fix to run on 0.12.x