Fix USR dir bug