no segfalts anymore
@FlorianPalm : please review //FIXME parts of the commit