Fix for workning directory