Prevent wrong creation
Fix bug