Reverted and added an alert for debug