closes #1 but still sometimes acting up