Could not reproduce this personally but I am told this fixes it.
note: did not run lints or fully test yet