patch to fix #61