Fixed critical bug #1