Bugfix (robustness issue) based on ticket ggl-list by Christophe, dated Aug 20, 2011 Phase 1, it still has to be reworked