Fix Cast discovery closes #8