Minor improvement ref #51