add #125 and #129 to troubleshooting