Commit before trying struct bug workaround.