Fix bitmarks