Fix right on lock. closes #2617