fix overriding properties using system properties