[IMPROVEMENT] Fixed issue #25