Bug fix attempt