added fix for countermap