Fix incorrectly merged PR #16