for fixing bug #21