Bugfix & added alert