there was still a bug... think I fixed it