Bug map fixed