Fix for double order creation