Hopefully fix the issue for good