hopefully got rid of the bugs