Trying to work around broken annotations