Trying to fix #167