fixed to include when  is == to 0