Attempted Bugfix for an unknown issue