Follow up for #151
Follow up for #151