fix #2086
why did this take 2 months?