handling the 2nd problem of #371