Tried to fix #110