Fix problem witj comment and locks. closes #2507