fixed issue with system properties interpolation