Fix for empty nodes