fix: fix some cases where 'digest is already in progress' is thrown for fa-modifiers