Possible fix for issue #2, need to promote and test among all system types