Depracation Fix

Replaced returning with tap