Fixed minor bug in Issue #15