enhancement to #11