Issue 715 block id fix