FIX: variable name
Merge branch 'bl'