Bug Fix on Debug