added fallback to system properties