Combined with previous commit to fix Issue #1