First try to fix #73 and #75