Fix somtimes Current System choice misses

Change-Id: I080af8b022df36d238ff4a7a81e8af553cf2f218