Fix of Bug #269