I think this fixes a bug