Fixed #168, #170