Temporary fix for notifications