fixed dir issues