enhancements of issue #50