fixes bad merge from a long time ago
resolving recent merge