Fix: Incorrect block ID if there is no metadata