Issue #31  fixed