Fixes for item #1 on pull request #24