This mod intent to fix MC-61489
Most of the fix come from mworzala's gist so credit to them for the fix, I just made it a mod. (They are not involved in the creation of it)