does this fix Bug#590??