Added Shears check and drops [gh#749,750]