Fixed bug mentioned in Issue #16.