Fixes System add bypass