v 0.3 fix 1