Added changes for issue #225.