Another small improvement for issue #28