Fix cs #115