Version info fix toward #1296 and #1297