Bug fix correction