Fix old bug (the not so difficult part)