CRI-fix-f9473f0
CRI fix Closes #69