Non-standard properties parsing fix

Fix for non-standard properties occuring multiple times.