Trying to fix #220