Minor bug fix to System object