Follow up from last commit