Bug fix no.2