Fixed g-issue#21