fixed evil bug