fixed bugs agaaain