Fix: issue#21