enhancement issue #24