bugifx: see last commit...raw stuff