comment out two bugss