Fixing issue found by Anthea.