Fixing issue with nil discipline