bugfixing by block