Trying to fix #7