Tried to fix a bug