Partial bug fix for score map