Marks suggestion fixed #335