bug removed partially