Fixed bug in Issue #1