PR for issue #38

A fix for issue #38.