Additional fix to issue #324