update based on until 6.5.1.a-2013051804