Fix old bug #149