Fixed removal of source