Fix bug described in Issue#16.