revert to way that should work