fix

c16404809 now correctly works when veilered
fix
fix
Merge pull request #797 from sidschingis/patch-2

fix