140905-iss002: optimize calculation