Fix some syntax from pull request #19. Fixes #22.