fix blocks
Merge origin/master