Use development configuration. This piece of code needs to be refactored.
Fix for the else case