fixed decompiling bugs

Change-Id: Id6a2a62c8b156e7b74b84b8e736e03bc250e5b20