Fixed another blocking bug #59