Bug fix
committted finally