Advance Market Commitment: Some Issues and a Remedy