Added temporary fix for default JSON response issue