Possible change to fix #9