Trying to fix #73