Fixed a bug but more came