Enhance: issue #11