fix to eliminate the extra created transaction
Merge branch 'cappaste' into stripe