Separate into two tasks to avoid problems