Fix for issue #299. Please confirm.