bug fix and developerExtras for debug