Bug 992872 - [master] Investigate and fix _tap method