Fixed rigid tapping bug