Issue #13: fixed wrong redirection
Issue #23 #25: Repairing of build