working stable, corrected a block mapping error