Update and fix (probably)