issue #168 & #175