Fixed the issue described in Issue #21