[#883488] Fixes, but not done yet.