Removed attempt to ignore global Buffer