Another fix to resolve #382.