attempt to fix #9