See #3338 for fix