Minor improvment related to #266