Bug fix

Some fix