Fixed self-shooting issues