Bug fix.
Better fix