fully resolved dir issues