Follow up issue after working on #137
Follow up issue after working on #137