bug#024 && bug#029