Fies to #160 and #156