Fixed newly introduced bug #130