Issue 605

PR for https://github.com/georchestra/georchestra/issues/605