Bug fix! need to rerun