Fixed dependency and string comparison