Fix duplicate definition, remove size limitation on results