Fixing the concentration bug

Reza, 

Your concentration problem should be fixed now. See commit comments for details. I could explain you tomorrow. 

Best
Haibing