Handling it here seems like a better approach :+1: