Fixed dependency pass