base fix on complicated setups