Fix: issue#20