Fixed to 0.3.4