Fixing accidental downcasing