hopefully should get rid of bugs