Fix bug in development/production call