Bugfix for defaults in $ENTRY