Fix for system property