Solved bug #B1