remove or wrap in some conditional maybe?