fix || bug