Update in progress to fix the possibility for abuse