fixed bad refactor...