Debug Fix