Hopefully fixing the issue