added "isset"-checks