comment and fix