Refactored #111.