Fixed open in new window issue