Update for fix #18.