Git issue #177 fix!