Update to fix #15