Trying to fix #75