Solved bug #2