Github issue #177