Annex-V bug fixing