Trying to fix Notify