Bug Fix on emit signal with no data