Quick fix to apply in server