Bug fix II