Bug fix for unit=entry #241