Bug-fix: Fixed Issue #16