Fix for multiple new order emails bug