refactored https://github.com/bisscraper/bisscraper/issues/16