BUG FIX - Cleaned up prior bug fix