Hopefully fixing a bug