Fix tank bug. Closes #733