fix edge case in singleton node creation