fixed some leftover