attempts to fix #59