added 'if' to remove nil on system page