applied patch by Sean884