missing code from 1.2.8 release