Fixed the every class to use the correct target