My Bug fix