Fixed command blocks. Fixes #1507