update to new constructor names
avoid NPE