revert to JH's original fix