changes related to #348