Fix for problem identified by K Sawada