fixing andreas' problems...