(maybe) fixed bug