Fix class suffix - #717