poor man's solution to #1868