Fix Issue #156 and #149