- By Benjamin Law for bug fixed 2584 and 2561