Fixed for v 0.4.3