refactor 187 support