am c665e363: am 0d2adfbb: Potential fix for a couple bugs

* commit 'c665e3637b19b4d49b88d037adf5d101ab39f354':