Bug found, revert in the meantime