Bug Fix + Debug