take care of issue #33 (tested locally