Fix for #455 in case of single node allocation.

Will try to backport this fix to devel branch.
The general fix is documented in #247, and will get resolved eventually, but
will likely not make it to the "current" agent.
merge from f/ea