fixed issues with notifications