Attempt at fixing impossible to fix bug.