Issue #177 final update