2591 bug fixed