Adding checks for op. See #118