Attempt to fix #125