Refactor-1. Fix #26