Follow-up to the previos commit fixing #6