Bug fix.  Was not finding the implementation in some cases