Fix double protect. Closes #1638