fixed bug in common block refactoring