fix #221 -- (3rd attempt)