Fixed critical bug #130