near bug fixed