Bug Fix pointed out by KaoS