fixed bugs with previous commit