Ok this will take some time to resolve, need a new configuration option