bugfix by isset()
unique convention - wip