Debug option fix