Fixed again - see pull request #155