Follow up from previous commit