Fix sugrcube BUGS

Change-Id: I946d619be51df3c0badee88fac609d8663c109eb