Trying to fix a bug