Fix #532, add system notice