Fixes #74 by switching returning to tap.