fixed questionable bug