Bug fix with lines 50