Quickfix for avatar helper