Semi-fix to BUG 29.