changes
Fix bugs on nib
Changes
Fix