This line could be moved to a after filter :wink: