fix little bugs 4