Fixed oncreate bug