An attempt to fix a bug