Fixing bugs in step 2 (Create quote)