Added to orders as well, just cause as per Issue #56